merge
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Sat, 18 Feb 2006 20:17:24 +0000 (13:17 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Sat, 18 Feb 2006 20:17:24 +0000 (13:17 -0700)
1  2 
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
xen/include/asm-ia64/config.h

Simple merge